From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 30 Jun 2010 17:11:42 +0000 (+0100)
Subject: Use gfn_to_mfn_query() rather then gfn_to_mfn() when changing P2M types
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11858
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=766445635522061166487e5b20db9844a1876bb4;p=xen.git

Use gfn_to_mfn_query() rather then gfn_to_mfn() when changing P2M types

Use gfn_to_mfn_query() rather then gfn_to_mfn() when changing
P2M types since we do not really want to force a PoD allocation
as a side effect.

Signed-off-by: Paul Durrant <Paul.Durrant@citrix.com>
---

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 717921bc46..36728c6192 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -2557,7 +2557,7 @@ p2m_type_t p2m_change_type(struct domain *d, unsigned long gfn,
 
     p2m_lock(d->arch.p2m);
 
-    mfn = gfn_to_mfn(d, gfn, &pt);
+    mfn = gfn_to_mfn_query(d, gfn, &pt);
     if ( pt == ot )
         set_p2m_entry(d, gfn, mfn, 0, nt);